Merge pull request #53 from nolanfilter/Nolan

Updated Control Scheme