Merge from upstream.

Merge branch 'master' of https://github.com/geppettodivacin/ecology
Made an ammendment and have to merge from upstream.

Merge branch 'master' of https://github.com/geppettodivacin/ecology