Merge pull request #70 from janm399/master

0.2-SNAPSHOT