Merge branch 'test'
Merge branch 'master' of https://github.com/jeepsterboy/EcoFOCI