Merge pull request #2 from krazdax5/master

forgotten merge