Fixes #13 (Crashing on setttings for 2.x)
Adds minor change
Adds minor changes.