Closes #1
Revert "Closes #1"

This reverts commit 4bcd8a17d24fb29fb9924530f64b91fd12e7c127.
Reverting for fixing
Fixes #1