enhancement for issue #469
Merge pull request #577 from giastfader/master

enhancement for issue #469
Merge branch 'master' into opti