Merge pull request #20 from ebollens/master

Add Conformance Definitions, Internal Routines and Minor Text Changes