Merge pull request #784 from dennishendriksen/master

0.0.2-SNAPSHOT to 0.0.2