Small edits based on review that I forgot to commit!
Merge pull request #328 from sungeunchoi/test

Small edits based on review that I forgot to commit!