Changed update frequency to 5 minutes
Merge branch 'issues/17'