2.1 release candidate
Merge pull request #152 from sudosuu/master

2.1 release candidate