Merge pull request #9 from cfeher/chris-feher

Chris feher