Merged changes from pfftYeahRight