Editor

Merge editor with master to make master up to date.