v2.1.1: Fixed #5

Fixed Issue #5.