added smack
Merge branch 'dev'