Merge pull request #192 from anthonytasca/master

Fixed the bug this time