fix merge
Merge pull request #36 from slwaller/master

fix merge