Merge pull request #3 from arielm/develop

feature/AtlasUpgrade
sample/GrapeFrukt: SIMPLIFICATION + ROBUSTNESS