Replace _this with @
Merge README changes