changed method assertThat for better usability
Merge remote-tracking branch 'origin/master'