Merge pull request #118 from aenario/master

Fix key names
add some spaces