proper 6dd34f9bec0a7537fa6ea1c9c18e178319d56485
Merge pull request #124 from sbillard/master

proper 6dd34f9bec0a7537fa6ea1c9c18e178319d56485