updated implementation
updated to version 0.3.2