debug again
Merge pull request #6 from jonbloom/master

debug again