Added a bit of diagnostics for issue #90.
Merge pull request #93 from yallie/master

Added some diagnostics for #90.