Changed interface with C++
Merge remote-tracking branch 'origin/version2' into version2

Conflicts:
	src/SSR_interface.cpp