Made proper building collition
Merge branch 'master' of github.com:MartinSkytte/eTD