Merge pull request #28 from escherba/master

use a glob to include exec.sh, also some refactoring