client version 0.4.8
merge upstream master