Merge pull request #1 from kud1ing/master

Port to latest incoming and make compile on Mac at least for "rustc --lib"
add a version of now() for Mac