prepared for merge
Merge branch 'mja054-master'