Revert "Merge pull request #118 from GottfriedSp/master"

This reverts commit e3e9e59798315c01a5e20b13c65bd5aab3736ed5, reversing
changes made to eb9fe2538dc51081651a9980858d56de23bc529a.