Fix curosr behavior (issues #17 and #20)
Merge branch 'master' of github.com:sergeyksv/tingodb