more changes
Merge pull request #49 from neilsycamore/master

more changes