various fixes and improved WLDF module
Merge pull request #6 from david-maza/wldf_fix

various fixes and improved WLDF module