closes #41
Merge pull request #51 from Itxaka/6.1

closes #41