More hacking for interfacing
Merge branch 'master' of https://github.com/i3l/Critical