few fixes
Merge pull request #12 from MirtlBu/master

few fixes