Derp, missed some debug statements. Resolves #7
Merge branch 'dev'