Merge pull request #17 from Alain-es/dev

Fixes a bug in the cleanup process
Merge pull request #18 from Alain-es/dev

Absolute/Relative paths fix
Fixing buggy resource map