master
correction of mentor's comments
correction of mentor's comments, adjustment of application structure