Updated build tools
Merge branch 'master' of github.com:joninvski/EnergyTimes