Quick and dirty bugfixes
Merge branch 'master' of https://github.com/Jon-Warren/Blackeye