Initial build for application
Merge origin/master