chris-cooper Merge pull request #17 from denverpierce/master