fixed issue53
merge