refactor
Merge branch 'master' of https://github.com/voj/voj.github.com