Housekeeping for version 0.3