Fix #20 - 1.0.15-SNAPSHOT1