Merge pull request #1 from AAROC/master

Update Bruce changes