Merge pull request #248 from cl0ck/dev

More Faction Improvements