Fixed #27 Fixed #34