last fixes
Merge pull request #16 from qbranch-code/lastfix

last fixes