Fixes #9, #13
Merge pull request #16 from JasonBristol/dev

Fixes #9, #13