drnic Merge pull request #16 from tinogomes/patch-1