Minor changes and improvements
Merge pull request #6 from VeryBigBro/patch-3

Minor changes and improvements