Merge branch 'incommand'

Conflicts:
	invewrapper/invewrapper.py