Mostly working initial version
Merge branch 'master' of github.com:Nemo157/PsBundle