Merge pull request #64 from saramgsilva/master

Fixes issue #57