Merge branch 'master' of https://github.com/wufei1310/ship.git