Merge pull request #195 from sd63/include_class-deprecated