fixed SA warnings
Merge pull request #2 from sdurandeu/new-feature-branch

fixed SA warnings