Test commit to verify master is in good shape
Merge pull request #565 from markewallace/TestCommit

Test commit to verify master is in good shape