Minor fixes.
Merge pull request #63 from joycem137/working

Minor fixes.