Merge pull request #1 from nilsding/next

Merge branch `next'
Merge pull request #2 from nilsding/master

Merge branch `next'