safety first, frosh
Merge branch 'master' of github.com:fwilliams/ncm