Did Redundant Code changes and Implemented CommandTimeout property.

fixes #54
fixes #57