Merge pull request #3 from C-Otto/patch-1