added pluso
Merge branch 'dev'