reformatted before removing obsolete API usage
Merge branch 'master' of https://github.com/jeremytammik/AdnRme