Fixed bug #32
Updated bug #33