v.1.1-1 Release

Full remake
Code Cleanup
Bugfix