Fix merge problem
Merge branch 'master' of github.com:leonson/smartanws
Find Office & Provide Util