Executable will now be substituted as well, relates to #15