Bug Fixes
Merge branch 'release/2.0' of https://github.com/nkirkes/capco-tile into release/2.0