Merge pull request #25 from albertcui/iss-22

Iss 22
Merge branch 'master' of github.com:albertcui/yasp into singleapi