Merge branch 'debug'

Signed-off-by: Eli Skeggs <skeggse@gmail.com>