preparing V1.3
merge