Merge pull request #5 from ColetteIsabella/master

Merge pull request #4 from ColetteIsabella/source
Merge pull request #6 from ColetteIsabella/master

Catching up source to master
Merge pull request #7 from ColetteIsabella/source

Cleaning