decreased complexety -> now working properly
Merge branch 'master' of github.com:joho2014/ESTW