Changes to tests and samples
Merge remote-tracking branch 'upstream/master'
Cosmetic
Merge pull request #11 from TheRealAgentK/master

Various small accumulated changes