Merge pull request #3 from anilsaldhana/master

see comments