Merge pull request #186 from michelled/review2

thank you michelle