Merge branch 'master' of https://github.com/mpguedes/maplink.git

Conflicts:
	README.md
Merge remote-tracking branch 'origin/master'