debugging attempt 3
Merge pull request #3 from JackDougherty/master

debugging attempt 3