Minor bugfixes
Feature #10

Added switches -e and -x