Fix build
add a README link to rtfd
Merge remote-tracking branch 'upstream2/master'