Fixes #37.
Merge pull request #38 from gneuvill/fjmaster

Fixes #37.