Applied minimal fixes
Merge pull request #14 from SoftCreatR/fixes

Apply minimal fixes