Merge pull request #11 from ex-nerd/patch-2