Merge pull request #2 from dubboerl/0.3.0

0.3.0