merge
Merge branch 'master' of https://github.com/sagieske/RP2
modifications for server, recomment when on laptop