Merge corrections
Merge pull request #2 from cbfiddle/testmerge

Testmerge
Merge branch 'refs/heads/master' into develop