Merge pull request #21 from geekmug/patch-1