*refactored editor a bit.
Merge remote-tracking branch 'origin/pre1.0' into pre1.0