version updated
Merge branch 'fixes' into working