Improved a few things
Deleted link
Merge branch 'master' into debian