commit 96
Merge branch 'master' of https://github.com/morgante/landmarkr