Add keywords
Prevent endless loop
Fix travis build
Fix Tests & add nww params