last fixes
Merge pull request #14 from waddo/master

last fixes