Working on #13, hacked in some diagnostics
Merge branch 'master' of github.com:Klortho/eutils-org