Merge pull request #115 from evoskuil/version2

Build with generated built scripts (and modified makefile.am).