mantkiew Merge pull request #3 from cho0thee/master