Even more changes for diferent computer interoperability
Merge branch 'master' of https://github.com/EdFil/AVT