Revert "issue #57 rijesen... 157a1ae4a5e92d0f60be5edbbc0303fcb4b8b25d"

This reverts commit 751b683273c2f1833dffd2e56c1ca80fc229bd31.