Add support for dictionary option argument: branch, rtp (#2)