update from master: version 0.5.4