Merge pull request #1 from jamesra/master

Minor bug fixes
Merge branch 'master'
Merge branch 'Nornir-Official'