merge pull request & upgrade to 0.3.4