Forgot to add some stuff this morning
Merge pull request #178 from bsplay/added_missing_stuff

Forgot to add some stuff this morning