commit before merging 0.4 stuff