Merge pull request #4 from krazdax5/master

forgotten merge