Merge branch '86-endif-misplaced-if-we-don-t-no-using-symlinks' into 'master'

Resolve "#endif misplaced if we don't use symlinks"

Closes #86

See merge request !36