Reworked entity constructors
Merge branch 'master' of github.com:steria/log-parser