Minor changes
Merge pull request #273 from KingCrunch/minor

Minor changes