some big update before 0.2 version release
merge and merge_option helpers