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