Merge pull request #125 from anilsaldhana/master

see comments