fixes #171
Merge branch 'feature/refactor-inc' into 2.0