Fixed #33; fixed #34