merge from master; version 0.6