Merge branch 'master' of https://github.com/huyangenruc/janus.git