Merge pull request #127 from anilsaldhana/master

see comments