Merge pull request #27 from deveyNull/patch-2