Version 1.1

Lots of changes