Merge pull request #44 from GJST-Capstone/gregory

Gregory
adding chosen form and merge fix