Fixed broken merge

Added back in changes that were overwritten by merge.
Merge branch 'master' of https://github.com/FinnStokes/IronHill