Merge pull request #5 from anilsaldhana/master

see comments