merged 'contribution' branch to 'master' branch