Another fix
Merge pull request #30 from bnormoyle/master

Another fix