more compatible#4

Open

needle-wang wants to merge 8 commits intotuxcanfly:masterfrom

needle-wang:master

Commits on Nov 7, 2015

Commits on Nov 8, 2015

Commits on Feb 21, 2016

resist exception
needle-wang
committed