Merge branch 'master' of https://github.com/nailed/nailed-forge