replaced (noun) with appropriate nouns
Merge pull request #10 from davidkun/master

replaced (noun) with appropriate nouns