Merge pull request #26 from MechStar/master

Added support for timeouts (Issue #14)