[feature #61]