Merge pull request #13 from Hasimir/master

Partial inversion of correct parts.
Merge pull request #14 from Hasimir/master

Updated source data