Drone included @stypen feedback from pullrequest