Fixed #1 - Add timeout support
2.1.0