Revert "Closed issue #1 #2 #3 #4"

This reverts commit 683897d70061562f55a4f88424d376b99d616876.