2.0 release candidate
Merge pull request #150 from sudosuu/master

2.1 release candidate