Merge pull request #6 from anilsaldhana/master

see comments