Some improvements
Merge branch 'master' of https://github.com/dizpers/dizpers.github.com