Merge pull request #5 from mlazowik/revert_pull_request

Revert "Merge pull request #4 from greenrd/master"
Revert "Revert "Merge pull request #4 from greenrd/master""

This reverts commit a865a8d5c4b2e20081e7c9e8a6c3ad23a975f29e.
Merge pull request #6 from mlazowik/fix_reverted_pull_request

Revert "Revert "Merge pull request #4 from greenrd/master""
Revert "Merge pull request #6 from mlazowik/fix_reverted_pull_request"

What a mess!

This reverts commit bb18f4a3a1168bcbe7ff9e708a43ef888c371292, reversing
changes made to 6146726cfe71066e5bbdfee21a9ac97b5d64bfa0.