added merge from master to branch atomo