Fixed #37 - Support for guide