Resolved issue #1 with definition issues.

  Noticed a issue with my "clever" hack.
Merge branch 'hotfix/0.1.6-3' into develop

* hotfix/0.1.6-3:
  Resolved issue #1 with definition issues.