Changed cleanup duration to 5 minutes

v2.0.1
Merge branch 'develop'