fixed algo
Merge branch 'dev-swag-algo' into dev