Merge pull request #2 from ProjectCS3305/master

you're welcome