'Merged' hubo-zmp into master branch