Armor params added
Fixed a few compiler warnings and compilation on OS X
Refactor `SettingsMenuState`
Merge pull request #85 from JanSimek/master

Fixed a few compiler warnings and compilation on OS X
Merge pull request #86 from smaximov/refactor-settings-menu-state

Refactor `SettingsMenuState`
lib updated
Source formatting