fixes #1
fixes #2
fixes #40
Merge branch 'master' of https://github.com/skylarbpayne/component-entity-system