adjusted if code (added elif instead of string of ifs)
Merge branch 'master' of https://github.com/chiulab/surpi