Fixed renaming issue
Merge branch 'dev'

Conflicts:
	python/singularity/Engine.py

First developed v2.0 but forget issue of v1.1 - Timeerror