Updating from 0.1 to 0.3.1 based on 0.3 from MSc backup