first round of Felix's changes
Merge branch 'master' of https://github.com/Nikhil-Shenoy/WinDrone
added Felix's corrections