Merge pull request #1 from goldenice/master

asdf
Improve uptime function
Merge pull request #24 from WoutervdBrink/master

Improve uptime function