Merge pull request #13 from sarina/master

Add some debugging