#18

Bugs fixed