Merge pull request #2 from Kloadut/master

Few improvements
Merge pull request #2 from abeudin/master

Merge pull request #2 from Kloadut/master