Fixed #33, Fixed #34, Fixed #27