Merge branch 'master' into sampleApp
rm redundant code
whitespace
Merge pull request #40 from Trott/sampleApp

rm redundant code