Updated and cleaned up the project
Cleaned working branch
Updated and cleaned up the project