Quick fixes.
Merge pull request #78 from smigolpol/master

Quick fixes.