Merge pull request #15 from kneemer/master

updating contributors to include John