Merge pull request #169 from nomeata/submit

My upstreamable changes so far
Closes #168