Merge pull request #172 from nomeata/submit

Two more changes