pull changes from master into gh-pages

confession: I accidentally pushed changes into master. Nothing dramatic, but still, I know, I should've pushed to mushon3 and issue a PR.