Merge pull request #1 from CP-Team-06-0003/master

Updating again
Fixed strange bug..
Merge pull request #8 from Seth-Johnson/master

Fixed strange bug