Refaktor
Merge branch 'TimeD' of https://github.com/dstoreng/TimeD.git