debugging attempt
Merge pull request #1 from JackDougherty/master

debugging attempt