made changes
modified from feedback
Merge pull request #1 from ray1claw/master

done