dieggsy Merge pull request #11 from ryuslash/master