Merge pull request #1 from furzeface/master

calculates initial timeout minus current milliseconds passed
Merge pull request #1 from tawashley/master

Merge pull request #1 from furzeface/master