adds new code
Merge pull request #2 from sclausson/master

adds new code