Latest fixes for improvements
Merge pull request #4 from Kajakaran/master

Latest fixes for improvements