Version update.
Refactored safe code to help prevent crashes.