fixed bugs2
Merge pull request #2 from GTi-Jr/bugs2

fixed bugs2