Merge branch 'ni' of github.com:Morriar/nit into ni