Working version for Impex (tested on uat)
Merge pull request #6 from aldogroup/unstable

Working version for Impex (tested on uat)