Closes #15
Merge pull request #70 from jpav/master

Closes #15