Revert "closes #29"

This reverts commit 2968466f2eaefbfb7865e44ed72c7f4eefd911f9.