Fixed stuff
Merge branch 'master' of github.com:kristoff3r/rkg-stuff
Added more functionality