issue#268 et al.: improved create and update of entry
Merge pull request #334 from igoryen/issue#268

issue#268 et al.: improved create and update of entry