Merge pull request #1 from CraigLovelock/followbutton

updated version with work on build updates
working?