Oops broke master, fix
Merge branch 'master' of github.com:CiaranMcCann/Nina