merge failure
merge failure
Merge pull request #234 from sbillard/master

fix merge failure