Merge pull request #148 from scshunt/master

Crappy implementation of a fix to issue #147
Experimentation with a better lifting model.

--DO NOT MERGE--