Changed interface
Merge branch 'master' into guiExperiment