Modified update time to 30s. Added time/error stats.
Merge remote branch 'origin/master'