fixed time threshold
Merge branch 'master' of github.com:TheGiftsProject/katalog
Updated todo