Merge pull request #41 from hueniverse/develop

0.6.0
0.6.1