Fixed #7 in 0.1.3-SNAPSHOT