Merge pull request #1 from christinasc/master

pull from christinasc