Minor fixes and improves
Merge pull request #5 from le717/patch-1

Minor fixes and improvements