Created by: Bobholamovic
Fix known bugs and refactor the framework.
No changes between github/fork/Bobholamovic/master and version 1
