Merge pull request #212 from smigolpol/master

Some minor changes.
Merge pull request #213 from smigolpol/master

Forgot to mark myself as an active contributor.