bug fix v1.1
pull master branch
just fix conflict from linux