Re-upload repo with all bug fixes
Incorporate original files