Merge pull request #90 from mshamash/master

	Initial commit with support for Navigraph NavData.
Merge
Merge pull request #40 from stephandev/master

Merge to avoid further conflicts