Some uncommitted changes from a while ago...
Merge branch 'master' of https://github.com/quadcopter5/quadcopter