Feature/editor 2014 12 23

Ready to publish @fiaa 's article for 2014-12-23