Merging 0.5 changes into my master