Merge pull request #10 from phoe-trash/master