Merge pull request #1 from fabfuel/develop

sync
Merge pull request #2 from fabfuel/develop

sync
extract instead of variables variable
Merge pull request #8 from potfur/extract-instead-variables-variable

Extract instead variables variable