Cleanup
Improved setup documentation
Merge pull request #7 from pR0Ps/upstream_fixes

Instructions and cleanup