Revert "Issue #19"

This reverts commit a5b3c7fa7a8d8084bcfb87ddcc04a8941bc90c64.