Merge pull request #15 from deepyaman/patch-1