Moved class
Removed prototype detection
Added basic JSON fix for Safari