Revert "deleted redundant stuff"

This reverts commit 2b6734ca3d0e7960a443399d2db28a3dde32b94e.
Merge remote-tracking branch 'origin/master'

Conflicts:
	interface.py
Merge remote-tracking branch 'origin/master'