Added a default 60 seconds buffer time with an setter to change with a max of 5 minutes
 - Fixes #20