bug fix
Merge branch 'iraklis_dev'