Revert "Improvement2"

This reverts commit 8de3d5c0e921fc124f297aaa52d00525e6f733d9.
Version 1.0.8 - mac OS support