Merge pull request #14 from smits/gen-scripts

Merging and closing #14