renamed methods for consistency
Merge remote-tracking branch 'origin/master'

Conflicts:
	Measurements/__init__.py
	Visualize/base.py