prepare for release 0.61_16
merge 0.61_16 that had not being pushed into master repository