Development

Merge version 1.1 into Master branch