very minor (but still important) changes
Merge branch 'master' into debugging
Merge pull request #6 from Julietbc/debugging

Debugging