Merge branch 'master' of https://github.com/nathanharber/Harber-Framework.git