Merge pull request #350 from wade1012/dev

Dev Wade
update war
Merge pull request #351 from forumbyr/master

update war
Merge pull request #6 from cnnic/dev

Dev