Fixed bug #23
Updated bug #23
Fixed bug #24
Updated bug #24
Fixed bug #25
Updated bug #25