Merge pull request #319 from ISeeDEDPpl/experimental

Merge in Experimental
Merge branch 'master' of https://github.com/ISeeDEDPpl/Questor into Master