fixed some errors from last commit :>
Merge branch 'dev'