Merge pull request #1 from timoschaefer/1.0

Merge branch '1.0'
Merge pull request #2 from timoschaefer/1.0

Merge branch '1.0'
Merge pull request #3 from timoschaefer/1.1

Merge branch '1.1'
Merge pull request #4 from timoschaefer/master

Merge branch '1.1'