Merge pull request #2 from felixcheng/solo

Solo