Some changes
Merge branch 'dev'

Some changes...