Merge pull request #42 from morpheyesh/master

3 fixes.
Fixed issues
Merge pull request #43 from rajthilakmca/master

Fixed issues
Merge pull request #44 from morpheyesh/master

minor fix