fixed bug
Merge pull request #11 from christopherfan/Chris_Branch

fixed bug