Bring back changes from dev into master, including a bump from 0.3.0 to 0.3.1