Merge pull request #338 from krakjoe/master

Fix condition test