nested functions hell
Merge branch 'gh-pages'