Merge version 1.3.0 into master