Hotfix to fix 100% of the awesomeness of this project
Merge branch 'hotfixa'