fixed failing tests
Merge remote-tracking branch 'upstream/master'
Merge pull request #464 from hhovsepy/master

fixed failing tests