Revert "Working on iss#5"

This reverts commit 99eb8cc12aa4090cc11edde2e27777e1a6b88eac.