Fixes #77
Fixes #52
Merge pull request #79 from se1-1314/debugging

Debugging