Rework according to 2014-4-29 document
Modified according to 2014-4-29 advice document
Merge branch 'master' into test-interface