Merging develop for 0.3.0 release