new stuff
Merge pull request #11 from jeffschulte/master

new stuff