Merge pull request #57 from anilsaldhana/master

see comments
Merge pull request #58 from anilsaldhana/master

see comments