sending Andre code
Merge pull request #15 from andredempsey/andrew

sending Andre code
conflicts resolved