further updates
Merge pull request #15 from matthewste/master

further updates