lol more changes
Merge pull request #37 from hwray/brian-changes

lol more changes