#353
Merge pull request #387 from jcotrel/master

#353