Fixed issue #6 / Pierrick-Craveur added documentation and test for -x and -g options