added stuff
Merge pull request #1 from guitarbeard/master

some stuff