Merge pull request #2 from cesanta/master

merge from upstream