reslove #13
resolve #14
Merge pull request #16 from egugue/feature/add_timetable_data_in_top

Feature/add timetable data in top