Fix #20, making types of width and height more strict