Merge pull request #1 from christinasc/master

pull from christinasc
Merge pull request #1 from ThePhage/master

Merge pull request #1 from christinasc/master