addressed issue #58
Merge branch 'master' into locations