Merge pull request #1 from Peiqi-SU/master

Peiqi pulled to mac
Merge branch 'singlemode'