Tpyos = my owrst eneym. Bugifxes.

I'm funny, huh?
Fix bugs!
Bugfixes!
Merge remote-tracking branch 'origin/master' into gh-pages