Adding Drone and Charge Support + Some Filtering
Merge pull request #3 from Barbers/master

Adding Drone and Charge Support + Some Filtering