Merge pull request #834 from beejisbrigit/brigit_dev

Brigit dev
commits from my mastah branch