Fun with custom controls (fixed several bugs, added default option)
Merge branch 'master' of https://github.com/dimmondslice/DuelMajorRepo