bugfix
Merge remote-tracking branch 'team/master'
Refactoring.
Merge remote-tracking branch 'extendedmind/master'
Merge remote-tracking branch 'extendedmind/master'