Merge pull request #111 from JongHeonChoi/rm_unnecessary_capability