Merge branch 'fixing_warnings' of https://github.com/andrewcsmith/nmatrix into andrewcsmith-fixing_warnings
Merge branch 'andrewcsmith-fixing_warnings'