fixes and tunings
Merge pull request #25 from ondras/master

fixes and tunings