trying this again
Merge pull request #7 from PopeOnARope/master

trying this again