Merge pull request #1 from jakeauyeung/spay

add