fixed shit
Merge branch 'brian'