fixed #405
Merge pull request #547 from jcotrel/master

fixed #405