Merge pull request #1 from brian978/develop

Merge develop with master
Merge remote-tracking branch 'origin/master'
Merge pull request #2 from brian978/develop

Moved test to new class