Merge pull request #4 from lewispeckover/master

Add master parameter show_timeout