Merge pull request #5 from clockfly/master

sync