fixes.
Merge pull request #5 from formapro-forks/master

Fix the error in payment factory. + some minor impr.