Merge pull request #3 from ckarcz/new/chris

New/chris