Updates from 0.5.1