Fixed condition (Thank you @joshuaruesweg)
Merge branch '2.0'