Fixed a bug where the app would not launch.
Merge branch 'dev'