Add targets, closes #191
Merge branch 'feature/targets' into develop