finish draft: issue 2-3
Fix some tiny issue
Merge pull request #94 from objccn/issue-2-3-webfrogs

finish draft: issue 2-3