Feature/editor 2014 12 10