Closes #31
Merge pull request #80 from zanardigit/develop

Closes #31