Merge pull request #50 from cptmashek/master

whomp