Fix for issue #53 #70 #72
Merge pull request #73 from NiteshKant/master

Fix for issue #53 #70 #72