Made things a bit more simpler and consistant
Merge pull request #87 from wickedchap/patch-1

Made things a bit more simpler and consistant