debugging errors
Merge pull request #3 from markwilkinson/master

debugging errors