Merge pull request #4 from Perikiyo/master