Add bom.txt support
Merge branch 'master' of https://github.com/adsllc/svrwx1