change terminology to be more inclusive
Merge pull request #2 from mrkafk/master

change terminology to be more inclusive