Merge pull request #31 from anilsaldhana/master

see comments