sync
Revert "sync"

This reverts commit 22dcecc09c8fa71c71976ee1f47a6aec9e9e4a08.
Bugs fixed
Merge remote-tracking branch 'upstream/test' into test
sync
Merge pull request #19 from gogolander/test

update