Merge pull request #106 from bsupnik/master-3.20

Master 3.20