Couple more things
Merge pull request #2 from MBQsniper/patch-2

Couple more things