Merge pull request #41 from anilsaldhana/master

see comments
Merge pull request #42 from anilsaldhana/master

see comments