Bugfix
Merge branch 'master' of https://github.com/ibest/ARC

Conflicts:
	ARC/mapper.py