add salma
Merge pull request #18 from ndomar/silvermist

add salma
Fixing merge conflicts