A few changes to testing
Solved merge conflict => this can happen during cherry-picking
Merge pull request #32 from @cpursley
Merge remote-tracking branch 'upstream/master'