Pull changes from @rogue8