Cleanup
Merge pull request #1 from bakura10/rename-options

Cleanup
Filled in comments where questions were marked
Merge branch 'hotfix/1'

Close #1