Merge pull request #151 from 5150Joker/dev

Final derp of the night - I hope.