Done! Fucking Done

It works I don't fucking care
Merge pull request #16 from brandonforster/MikeWork

Push code changes