Fixed problem with duplicate headers
Fixed unicode problem
Sync with OnlineObjects