#162
Merge pull request #172 from sbillard/master

#162