Fix everything

Boostrap it
Merge pull request #1 from Lusitanian/patch-1

Fix everything