Updating fork

If I'm doing it wrong, PLEASE don't merge it.