Fixes for the OCD driven self ;-)
Merge pull request #17 from keheliya/patch-1

Fixes for the OCD driven self ;-)