changed version history
Merge branch 'dev'