Merge pull request #2 from bkng/develop

refactoring and extension of Entry
fixed indentation in Entry