Merge branch 'develop'
Merge pull request #604 from apathyboy/master

0.6.0 Release