Fixed bug #26
Fixed bug 28
Updated bug #28