Add additional debug info
Merge pull request #151 from elandau/master

Add additional debug info