Merge branch 'develop'

Conflicts:
	examples/standalone.py
Merge branch 'develop'

Conflicts:
	examples/standalone.py