more stuff
Merge pull request #14 from rmcdole/master

more stuff