definitions bugfixes
Merge pull request #5 from pawelkaminski/rtomkowski/definitions-upgrade

definitions bugfixes