English bugs, special thanks to Kevin m(_ _)m
Merge branch 'master' into gh-pages