Merge pull request #1 from Ethanjfobrien/master

alex added his id and I merged it