Jpcloud master

@jpcloud PR