Closes #137
Merge pull request #139 from brucellino/master

Closes #137