Fixing merge conflict
Fixing merge conflict

Merge remote-tracking branch 'upstream/master'
Merge pull request #382 from iameric1986/master

More Junit tests