Philip Corliss requested: Looks okay to me, can you make the appropriate changes minus the debug statements and issue a pull request.