bugfix for duplicate symbols#81

haykh merged 3 commits intoentity-toolkit:1.2.0rcentity-toolkit/entity:1.2.0rcfrom

pmocz:dev/bugfixpmocz/entity:dev/bugfixCopy head branch name to clipboard