Merge pull request #4 from lddubeau/develop

Bug fix.