further updates
Merge pull request #35 from matthewste/master

further updates