some changes
some bugs
Merge pull request #1 from veyroter/master

Some bug changes