Imported Upstream version 2.5
Merge pull request #3 from juw/upstream

Imported Upstream version 2.5