References #121
Merge pull request #294 from santiagopuerta/patch-1

References #121