fixed #4
Merge branch 'bug/4-timetracker-properties' into dev