Merge branch 'include-target-type-in-phash' into 'master'

Include target type in persistent hash (Fixes #88 on gitlab)

Closes #88

See merge request !146