More updates
Merge pull request #2 from dian4554/fix-wadl2

More updates