sync
Merge remote-tracking branch 'upstream/test' into test
bug fixed
Merge pull request #335 from gogolander/test

Bug fixes