Merge pull request #128 from kiransj/patch-1