fixed bugs
Merge pull request #3 from michal777/master

fixed bugs