merged issue53 onto gh-pages. 2nd pass