rsource flag added
Merge branch 'master' of https://github.com/PaulCher/ctf-framework
minor changes, preparations for major changes