Switched to OO
Merge branch 'master' of https://github.com/tlrh314/misc