version 1.3
merge fixed