Temp commit
Working now
Bug is finally fixed
Merging branch 'bug53'