more stuff
Merge pull request #56 from rjh427/master

more stuff