prelimiary editing of 155
Merge branch 'master' of https://github.com/HMT-seminar-2014/hmt-12B