update from master: version 0.6.1