Change Entry class and add Information class
Merge branch 'working' into dev
Merge branch 'dev' of https://github.com/plumer/diki into dev
change author name to diki
Merge branch 'dev' into working