wibeasley Merge pull request #309 from OuhscBbmc/dev