Merge pull request #2 from felixcheng/solo

Solo
Merge pull request #25 from felixcheng/felix-3

Merge pull request #2 from felixcheng/solo