Change in 1st branch
Merge pull request #1 from FlightFinder/FirstBranch

merged, goes with 1st branch