Updated to better reflect current API
Merge https://github.com/jhoxray/observatory