Minor refactor
Merge pull request #4 from buren/executable_setup

Minor refactor