Merge pull request #58 from Javichuck/master

Fixes UI
Warnings