bug fixes
Merge pull request #1 from leha1987/master

bug fixes