Changed some numbers, fixed issue #9