Merge pull request #7 from camfindlay/1.0

forward port updates from 1.0 to master
Merge pull request #8 from camfindlay/master

Merge pull request #7 from camfindlay/1.0