definitions completed
Merge pull request #152 from domasin/master

definitions completed