Fixing META-236 ticket
Merge pull request #15 from harsha89/META-236

Fixing META-236 ticket