rebase on version 0.5.9