Issue: #240 - Rename the returned hash keys
Issue: #240 - Documentation update