Merge branch 'feature/effects' into develop

Closes #1.