Pull 0.3.1 into master