Updated to entity 1.4
Merge pull request #29 from lsolesen/entity-update

Updated to entity 1.4