Swuird rebase

there was a change to master;  this pull request was intended to rebase the swuird branch on top of the change to master.

@lmcglohon