20 seconds updates
Merge pull request #60 from pcsmits/master

20 seconds updates