update from master: version 0.4.6