Merge pull request #31 from KeithYokoma/master

Looks good to me.