Small Changes...got received data working
Merge pull request #21 from cameronklein/joshuaBranch2

Small Changes...got received data working
Merge remote-tracking branch 'origin/master'
Merge branch 'master' into Cameron