Merge c4milo's fork

Merging changes from c4milo's fork.

/cc @c4milo @3y3