Final changes for 0.4.5