Two more submissions
Merge pull request #388 from uric/master

Two more submissions