refactoring
refactoring, again
Merge remote-tracking branch 'origin/master' into gh-pages