Improved the script evaluation to preserve the type
Merge pull request #21 from stof/evaluate_script

Improved the script evaluation to preserve the type