Imported Upstream version 2.6
Merge pull request #7 from juw/upstream

Imported Upstream version 2.6