merge fix
Merge pull request #36 from slwaller/master

merge fix