date modification
Merge https://github.com/mihkell/aproject