Merge pull request #20 from deveyNull/master