Small fixes
Merge pull request #17 from pylerSM/patch-7

Small fixes