krped ftw
Merge pull request #1847 from krped/add-krped

Merging PR from @krped