Merge fork

Merging changes from icecreammatt's fork