update from master: version 0.2.1