improve main files
Merge branch 'master' of https://github.com/thintron/thintron