Merged back changes from 0.3.x branch