Revert "issue/#18"

This reverts commit 68f3e3a47a75a8eeaa2bc3c40b037efb90c9aba4.