There has been an increased use of medical Cannabis in the United States of America as more states legalize its use. Complete chemical analyses of this material can vary considerably between producers and is often not fully provided to consumers. We report the development of a simple extraction and analysis method, amenable to use by commercial laboratories for the detection and quantification of both cannabinoids and terpenoids. Inclusion of terpenoids with cannabinoids in the analysis of medical cannabis should be encouraged, as both of these classes of compounds could play a role in the beneficial medical effects of different cannabis strains.