bug fixes
Merge pull request #2 from webasyst/master

bug fixes