Merge pull request #21 from theit/MRELEASE-1009

Fixes for MRELEASE-1009: