Final changes for 0.3.0