fix
Merge branch 'master' of github.com:ducdigital/s42m
fix
Merge branch 'master' of github.com:ducdigital/s42m

ok
Merge branch 'master' of github.com:ducdigital/s42m

ok
Merge branch 'master' of github.com:ducdigital/s42m

ok
fix
Merge branch 'master' of github.com:ducdigital/s42m

ok
Improved design