v1.1

Bugs fixed