some changes + design
Merge branch 'master' of https://github.com/overflowerror/SIS