Fixed issue 94
Merge pull request #95 from joseeantonior/master

Fixes #94