merge Attention branch to master branch