contributors and fixes
Merge pull request #36 from maciejborkowski/gh-pages

contributors and fixes