bumping version
Merge branch 'master' into garora_project_name
fixing tests