Cleanup
Update
Update doc
Remove empty line
Update property name
Merge pull request #36 from bakura10/fix-2

Cleanup