Feature/editor 2014 12 15

Ready to publish @aero's 2014-12-15 article