Merge WIP for 0.3.0