[BUG] For PS 2.0, due to wrong variables scopes.
Merge pull request #4 from masantiago/master

[BUG] For PS 2.0, due to wrong variables scopes.