Minor fixes
Merge pull request #12 from twokul/app-fix

Minor fixes