Merge pull request #139 from evoskuil/version2

Change generated install to support variable options.