Merge pull request by @joakin closes #117