more changes
Merge pull request #50 from neilsycamore/master

more changes