Merge remote branch 'upstream/master'
some nmf edits
Merge branch 'master' of https://github.com/chris-stock/thunder
Merge branch 'master' of https://github.com/chris-stock/thunder
bug fixes