Merge pull request #19 from jlord/add-jlord

Merging PR from @jlord
Revert pull request #19 from jlord/add-jlord
again