Merge pull request #3 from felixcheng/felix-3

Merge pull request #2 from felixcheng/solo
Merge pull request #26 from felixcheng/master

Trial