Robust-ify a bit
Merge pull request #137 from mariogiov/devel

Robust-ify a bit