Merge pull request #9 from phoe-trash/master