Remove unused variable
Remove double slash in tarball path
Add some hacking and doc stuff
Merge branch 'master' into pr/2