New dev version
Fixes date
Merge branch 'dev'