synced with branch gh-pages. fixes #36.
merge conflict resolved