1.0.2 - bug fixed
Revert "1.0.2 - bug fixed"

This reverts commit 2e1a51e3ce4884735163ae8d4fbd36bab1e98b26.
Revert "Revert "1.0.2 - bug fixed""

This reverts commit b28b3c6441829e5d68cd9478f347cb492125aeec.