executable.py cleanup
solution to merge conflict
Merge pull request #12 from sapresearch/mehlcat-dev

[alex][mehlcat-dev] second attempt at PR
Merge pull request #13 from sapresearch/alexis-dev

PR test
conflict resolution