Mikeperetz master

had to fix some stuff, i think you've got to pull from me, then send me a pull request.