Factoring Works, also fixed some stuff.
Merge branch 'master' of https://github.com/agibner/Karma.git