Merge pull request #5 from pslestang/0.2.1

0.2.1
Merge branch 'master' into 0.3.0