Applied small fixes

I forgot two small things in my last commit
Merge pull request #5 from SoftCreatR/patch-3

Apply small fixes