fix issue #15 #16
Merge branch 'master' of github.com:zhiwen/styleCombine3