Some fixes
quick merge
merge...
Merge pull request #1 from AlexRacoon/master

Fixed some bugs