Merge branch 'master' into issue#16
authorFreeBirdLjj <ljj11011@mail.ustc.edu.cn>
Sun, 28 Sep 2014 11:58:24 +0000 (19:58 +0800)
committerFreeBirdLjj <ljj11011@mail.ustc.edu.cn>
Sun, 28 Sep 2014 11:58:24 +0000 (19:58 +0800)

Trivial merge