Closes #39
Merge branch 'orodrigu'