v1.2 - Minor code changes and switched to PreferenceBundles.