fixed bugs
Merge pull request #1 from ginxwar/s1000

fixed bugs