add update
add update
add validation
bug fix
Merge pull request #17 from medo/sara_update

Sara update