Updated working app
Merged master