Version 0.3.0 merge into master