Both of them in one single commit :)
Merge pull request #6 from crhrabal/master

Both of them in one single commit :)