Merge pull request #2 from larslarsen/master

0.1.0