Merge pull request #5 from clockfly/master

sync
Merge pull request #2 from gearpump/master

Merge pull request #5 from clockfly/master