remove unneeded variable
bug fix
fix conflicts
bug fixes
bug fixes
remove extra line
Merge pull request #24 from medo/sara_update

Sara update