Re revert (#554)

* Revert "possible indent revert(dev branch) (#550)"

This reverts commit b884680.

* fixed major issue

* try ..catch and timeout

Author: bounceme