Merge pull request #901 from beejisbrigit/brigit_dev

commits from my mastah branch