Merge pull request #3 from MaximumGeeker/master