Merge pull request #121 from davidpflugpeil/1.1

1.1
Merge pull request #123 from davidpflugpeil/master

Merge pull request #121 from davidpflugpeil/1.1