Fix application setting

Closes #6 #7