Merge remote-tracking branch 'origin/master' into mine
Changed read.me to reflect #5
Merge pull request #7 from rborn/master

Changed read.me to reflect #5