Changed a bug for Taylor
Merge branch 'master' of https://github.com/MarjieVolk/Ecosystem