Merge pull request #169 from alistair23/alistair/app_head

bors causes trouble. Manually merging...