Robustness
Merge pull request #46 from korczis/devel

Robustness