Merged changes from Natethegreatt repo