fixed merge issue
Merge pull request #7 from keeronmarc/issueTHINGS-got-SCREWED

fixed merge issue