Fixed issue with string format.
Merge branch 'refactor' into development
Merge branch 'development'