Merge pull request #7 from TehporP/master

FAQ Greg
Well a foolish bug
Merge pull request #2 from RogerZhangHS/master

Fix a foolish bug God damn