Merge pull request #1 from p2t2/DEV2.1

Dev2.1
Merge pull request #66 from bruttenberg/DEV2.1

Merge pull request #1 from p2t2/DEV2.1