add more stuff
Merge pull request #196 from dildick/master

add more stuff