Merge branch 'integration' of https://github.com/laurencelundblade/QCBOR into integration
diff --git a/README.md b/README.md
index bb49970..8ced5d1 100644
--- a/README.md
+++ b/README.md
@@ -69,14 +69,18 @@
 There is a simple makefile for the UNIX style command line binary that
 compiles everything to run the tests.
 
-The actual non-test source files are these seven:
-* inc/UsefulBuf.h
-* inc/qcbor.h
-* src/UsefulBuf.c
-* src/qcbor_encode.c
-* src/qcbor_decode.c
-* src/ieee754.h
-* src/ieee754.c
+These seven files, the contents of the src and inc directories, make
+up the entire implementation.  
+
+* inc
+   * UsefulBuf.h
+   * qcbor.h
+* src
+   * UsefulBuf.c
+   * qcbor_encode.c
+   * qcbor_decode.c
+   * ieee754.h
+   * ieee754.c
 
 For most use cases you should just be able to add them to your
 project. Hopefully the easy portability of this implementation makes
@@ -94,7 +98,7 @@
 the main implementation.  If your development environment doesn't
 support UNIX style command line and make, you should be able to make a
 simple project and add the test files to it.  Then just call
-run_tests() to invoke them all.
+RunTests() to invoke them all.
 
 
 ## Changes from CAF Version
@@ -132,7 +136,7 @@
 
 Files created inside Qualcomm and open-sourced through CAF (The Code
 Aurora Forum) have a slightly modified 3-Clause BSD License. The
-modification additional disclaims NON-INFRINGEMENT.
+modification additionally disclaims NON-INFRINGEMENT.
 
 Files created after release to CAF use the standard 3-Clause BSD
 License with no modification. These files have the SPDX license
diff --git a/test/run_tests.h b/test/run_tests.h
index 153107c..850c4e2 100644
--- a/test/run_tests.h
+++ b/test/run_tests.h
@@ -45,13 +45,13 @@
  @param[in] bNewline   If non-zero, output a newline after the string
 
  This is a prototype of a function to be passed to RunTests() to
- output text strings. 
+ output text strings.
 
  This can be implemented with stdio (if available) using a straight
  call to fputs() where the FILE * is passed as the pOutCtx as shown in
  the example code below.  This code is for Linux where the newline is
  a \\n. Windows usually prefers \\r\\n.
- 
+
  @code
     static void fputs_wrapper(const char *szString, void *pOutCtx, int bNewLine)
     {