Merge pull request #30 from martinghunt/master

version 0.9.0