#9 update tests
#9 update tests
Merge remote-tracking branch 'origin/master'