merge r166
merge r167
fixed Makefile errors
merge r169
merge r170
merge r171
merge r172
merge r173