v0.3.3 Fixed #26