merge from dev: version 0.5.3