Merge pull request #1 from brucekissinger/master

Initial pull request