NS: Couple of fixes...
Merge branch 'master' of github.com:memmett/minipfasst