Updated to version 1.3
merge 1.3