sqlite3 func update
Merge remote-tracking branch 'origin/work' into development