Apply pull request 42
Merge branch 'master' of https://github.com/AirSage/Petrel