Merge pull request #18 from kostya-viktorov/master

SharedPreferences working, but Settings are not.
Merge pull request #8 from praccu/master

Updating