Merge branch 'target-association-refactor' into 'master'

Refactor target association

Closes #34

See merge request !42