Merge pull request #7 from coderaiser/dev

v0.5.0
Merge branch 'master' into dev