Merge pull request #34 from evoskuil/version2

Change generated install to support variable options.