1.1

Final Version 1.1 merged into master