rik's add
Merge pull request #1 from RikJohnson/master

rik's add