Merge pull request #121 from davidpflugpeil/1.1

1.1