update from master: version 0.3.0