fixed method
tests fixed
Merge branch 'release' into production