issue53
merge master into iss53 test