Fixed #8
Version up to 0.2.0-b7