Build of the app...
Refactored some things
update
Merge branch 'release/v1.1'