master #15 fix main app