Merge work for 0.0.4 release into master