Merge pull request #1 from pief/master

Sync with upstream 0.4
Merge pull request #2 from pief/master

Sync with upstream 0.4.5
Merge pull request #10 from dfs-sh/master

Aktualisieren auf Upstream master