Small fix in buf callback functions
Merge branch 'release' of github.com:dimitriv/Ziria into dev