Added tkahn
Merge pull request #414 from tkahn/master

Added tkahn