prepare quote problem fix
Merge branch 'release/0.0.23'
merged develop to master