Closes #2
Merge pull request #3 from jpav/jpav

Closes #2