Extended work of 2014-12-28 Hackathon