Merged changes from torrentkino
Merge branch 'master' of https://github.com/torrentkino/tumbleweed