Final changes for version 0.3