update doc and war
Merge pull request #333 from forumbyr/master

update doc and war