Merge pull request #6 from CliffordAnderson/master

Merge pull request #46 from Ramona2020/master
Merge pull request #47 from Ramona2020/master

Merge pull request #6 from CliffordAnderson/master