more changes
Merge pull request #39 from janeskim/editsMore

more changes