Merge pull request #10 from metadaddy-sfdc/develop

Merge fixes
v0.1.9
Merge branch 'master' into develop