Fix some issues
Merge branch 'awkasem-master'
Added application name