commit 2 merge
Merge branch 'master' of https://github.com/skortchmark9/riMap