Issue #223, Issue 220
Merge pull request #226 from RaulBer/master

Issue #223, Issue #220