last changes
fix date bug
Merge branch 'single'