Revert "Revert "Merge pull request #26 from pdpiech/master""

This reverts commit 6f44392f6e39f713d0ae2506db5352bf543f7217.