version 1.8 release
merge 1.9 changes