Merge pull request #1 from ThomasSolti/master

Merge changes from ThomasSolti
Refactor, change CPT hash value representation