cp2 from master
Merge pull request #1 from beschnabel/cp2

cp2 from master