Dev 1.3.0

Merge 1.3.1 to master