Removed BOM
Merge branch 'origin/master'