Closes #13
Merge pull request #109 from jpav/master

Closes #13