Merge pull request #8 from wagnert/master

Extend interfaces and add constant for default timeout method