further updates
Merge pull request #10 from matthewste/master

further updates