Merge pull request #17 from deveyNull/patch-1