Add a few things here and there
Merge pull request #1 from hashdist/ondrej-proposed

Add a few things here and there