Updated master
Merge branch 'master' of https://github.com/Tribex-Software-Development/RapidS