merge commits from 0.4.0.0