Fixed #18
v0.2.3