Merge pull request #119 from afabiani/gs-2.4.x-backPort

Gs 2.4.x back port
- Issue #120
 - cleanup target dir
 - issue #121