Bug fix version 1.1 for master