update travis
Merge branch 'master' into 1.1.0-dev
change .initAttrs agrument #40