Created by: Bobholamovic
Fix known bugs and refactor the framework.
github/fork/Bobholamovic/master
restored source branch github/fork/Bobholamovic/master