Merge pull request #1 from michelleoj/master

req
Merge pull request #2 from michelleoj/master

req
Merge pull request #9 from lu16j/master

req