Merge "Modified to run both on guilin and master branch"