bug fix
Merge branch 'master' of https://github.com/cniclsh/emulator-py

Conflicts:
	settings.json