port to latest incoming
make compile for "rustc --lib" in Mac
Merge pull request #1 from kud1ing/master

Port to latest incoming and make compile on Mac at least for "rustc --lib"