fixed minor bug
Merge branch 'master' into exec