DEP-77 fixes
Merge pull request #106 from maciejborkowski/gh-pages

DEP-77 fixes