Revert "Issue #107"

This reverts commit 2be02a8fa4c87ae0bf7da895c42f8e75c298e7b0.