Merge pull request #237 from RosettaCommons/hahnbeom/patchs Hahnbeom/patchs: bug fix & speed up & control option for context-dependence