Merge branch 'master', update gem version to 1.2.1.alpha