Changed a few things to work in TFS 1.0
Merge branch 'master' of https://github.com/dominique120/AeiaOTS10X