Make work with NIBs

Signed-off-by: Mark Kirk <mklists@gmail.com>
Merge branch 'refs/heads/mwk/dev'