Merge pull request #1 from haozhu233/master

bring up to date with master