add some stuff
Merge pull request #2 from bkardell/master

add some stuff