new stuff
Merge pull request #17 from gregory-nisbet/master

new stuff