Added non-blocking support
Version bump