ticket #47
Merge branch 'ticket47' of github.com:Softmotions/ejdb into ticket47