updated codebase
Merge branch 'devel'

Merged with latest commit from Tea